From: Gert Wollny Date: Mon, 6 Aug 2018 12:02:50 +0000 (+0200) Subject: d/patches: Update patches to apply to new version X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~206 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=df0633378b8bda8da2a0df9e0f59de6138e9f93c;p=dcmtk.git d/patches: Update patches to apply to new version --- diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch index b6678baf..56c23d1f 100644 --- a/debian/patches/03_datadic_install.patch +++ b/debian/patches/03_datadic_install.patch @@ -8,12 +8,12 @@ Author: Mathieu Malaterre SET(ENVIRONMENT_PATH_SEPARATOR ";") # Set dictionary path to the data dir inside install main dir (prefix) IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY) -- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIR}\\\\dicom.dic") -+ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIC}\\\\dicom.dic") +- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic") ++ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\dicom.dic") # If private dictionary should be utilized, add it to default dictionary path. IF(ENABLE_PRIVATE_TAGS) -- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIR}\\\\private.dic") -+ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIC}\\\\private.dic") +- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic") ++ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\private.dic") ENDIF(ENABLE_PRIVATE_TAGS) # Again, for Windows strip all / from path and replace it with \\. STRING(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}") @@ -21,24 +21,22 @@ Author: Mathieu Malaterre SET(ENVIRONMENT_PATH_SEPARATOR ":") # Set dictionary path to the data dir inside install main dir (prefix). IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY) -- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/dicom.dic") -+ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIC}/dicom.dic") +- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic") ++ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/dicom.dic") # If private dictionary should be utilized, add it to default dictionary path. IF(ENABLE_PRIVATE_TAGS) -- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/private.dic") -+ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIC}/private.dic") +- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic") ++ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/private.dic") ENDIF(ENABLE_PRIVATE_TAGS) ELSE(DCMTK_ENABLE_EXTERNAL_DICTIONARY) SET(DCM_DICT_DEFAULT_PATH "") --- a/dcmdata/data/CMakeLists.txt +++ b/dcmdata/data/CMakeLists.txt -@@ -1,6 +1,7 @@ +@@ -1,5 +1,6 @@ # declare installation files --INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${DCMTK_INSTALL_DATDIR}" COMPONENT data) -- +-INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data) +INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) +INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data) -+ + # add paths to the dictionaries to a CMake variable for being used by the unit tests SET(DCMTK_DICOM_DICTIONARIES - "${CMAKE_CURRENT_SOURCE_DIR}/dicom.dic" diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch index 1d9fc5fa..6fab7dd1 100644 --- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch +++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch @@ -4,7 +4,7 @@ Date: Fri, 4 Jul 2014 12:02:51 +0200 Subject: [PATCH] Fixed OFoptional by introducing OFalign? --- a/CMake/osconfig.h.in +++ b/CMake/osconfig.h.in -@@ -1162,4 +1162,7 @@ +@@ -1165,4 +1165,7 @@ /* Define if we are supposed to use STL's system_error */ #cmakedefine HAVE_STL_SYSTEM_ERROR @HAVE_STL_SYSTEM_ERROR@ @@ -14,7 +14,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign? #endif /* !OSCONFIG_H*/ --- a/config/aclocal.m4 +++ b/config/aclocal.m4 -@@ -1922,6 +1922,47 @@ +@@ -1953,6 +1953,47 @@ fi ]) @@ -64,7 +64,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign? dnl This macro checks if a given preprocessor symbol exists and is a string --- a/config/configure +++ b/config/configure -@@ -16711,6 +16711,66 @@ +@@ -16752,6 +16752,66 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch index 2b8a9f43..112eb21b 100644 --- a/debian/patches/05_performance.patch +++ b/debian/patches/05_performance.patch @@ -5,7 +5,7 @@ Author: Sebastien Jodogne Last-Update: Fri, 15 May 2015 16:39:01 UTC --- a/dcmnet/libsrc/dul.cc +++ b/dcmnet/libsrc/dul.cc -@@ -1862,7 +1862,7 @@ +@@ -1897,7 +1897,7 @@ msg += OFStandard::getLastNetworkErrorCode().message(); return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); } @@ -16,7 +16,7 @@ Last-Update: Fri, 15 May 2015 16:39:01 UTC * Disable the so-called Nagle algorithm (if requested). --- a/dcmnet/libsrc/dulfsm.cc +++ b/dcmnet/libsrc/dulfsm.cc -@@ -2447,7 +2447,7 @@ +@@ -2461,7 +2461,7 @@ msg += OFStandard::getLastNetworkErrorCode().message(); return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); } diff --git a/debian/patches/06_soversion_abi.patch b/debian/patches/06_soversion_abi.patch index e293e58b..7459448b 100644 --- a/debian/patches/06_soversion_abi.patch +++ b/debian/patches/06_soversion_abi.patch @@ -4,7 +4,7 @@ Last-Update: 2016-04-09 --- a/CMake/dcmtkPrepare.cmake +++ b/CMake/dcmtkPrepare.cmake -@@ -56,7 +56,7 @@ +@@ -55,7 +55,7 @@ #SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/") # Shared library version information diff --git a/debian/patches/07_dont_export_all_executables.patch b/debian/patches/07_dont_export_all_executables.patch index a983d3cb..dd1d9c72 100644 --- a/debian/patches/07_dont_export_all_executables.patch +++ b/debian/patches/07_dont_export_all_executables.patch @@ -8,7 +8,7 @@ Bug-Debian: https://bugs.debian.org/803304 Author: Gert Wollny --- a/CMake/dcmtkMacros.cmake +++ b/CMake/dcmtkMacros.cmake -@@ -55,11 +55,11 @@ +@@ -60,11 +60,11 @@ ENDIF(WIN32 AND NOT MINGW) # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property @@ -20,5 +20,5 @@ Author: Gert Wollny - EXPORT DCMTKTargets +# EXPORT DCMTKTargets COMPONENT bin - DESTINATION ${DCMTK_INSTALL_BINDIR}) + DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF(BUILD_APPS) diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch index 880bdf29..688d0065 100644 --- a/debian/patches/08_remove_system_processor.patch +++ b/debian/patches/08_remove_system_processor.patch @@ -23,7 +23,7 @@ Author: Gert Wollny IF(WIN32 AND NOT CYGWIN) --- a/CMake/dcmtkPrepare.cmake +++ b/CMake/dcmtkPrepare.cmake -@@ -389,11 +389,6 @@ +@@ -376,11 +376,6 @@ OPTION(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF) MARK_AS_ADVANCED(DCMTK_FORCE_FPIC_ON_UNIX) diff --git a/debian/patches/09_fix_format_on_32bit.patch b/debian/patches/09_fix_format_on_32bit.patch index 515f5d0a..8cf58485 100644 --- a/debian/patches/09_fix_format_on_32bit.patch +++ b/debian/patches/09_fix_format_on_32bit.patch @@ -34,24 +34,7 @@ Last-Changed: 2017-09-06 nextIsItem = OFFalse; --- a/dcmdata/libsrc/dcvrul.cc +++ b/dcmdata/libsrc/dcvrul.cc -@@ -178,15 +178,10 @@ - { - /* check whether first value is printed (omit delimiter) */ - if (i == 0) --#if SIZEOF_LONG == 8 - sprintf(buffer, "%u", *uintVals); - else - sprintf(buffer, "\\%u", *uintVals); --#else -- sprintf(buffer, "%lu", *uintVals); -- else -- sprintf(buffer, "\\%lu", *uintVals); --#endif -+ - /* check whether current value sticks to the length limit */ - newLength = printedLength + OFstatic_cast(unsigned long, strlen(buffer)); - if ((newLength <= maxLength) && ((i + 1 == count) || (newLength + 3 <= maxLength))) -@@ -325,11 +320,7 @@ +@@ -334,11 +334,7 @@ /* get specified value from multi-valued string */ pos = DcmElement::getValueFromString(stringVal, pos, stringLen, value); if (value.empty() || @@ -79,25 +62,7 @@ Last-Changed: 2017-09-06 /* jump to next time offset */ --- a/dcmdata/libsrc/dcvrsl.cc +++ b/dcmdata/libsrc/dcvrsl.cc -@@ -177,17 +177,10 @@ - for (unsigned int i = 0; i < count; i++, sintVals++) - { - /* check whether first value is printed (omit delimiter) */ --#if SIZEOF_LONG == 8 - if (i == 0) - sprintf(buffer, "%d", *sintVals); - else - sprintf(buffer, "\\%d", *sintVals); --#else -- if (i == 0) -- sprintf(buffer, "%ld", *sintVals); -- else -- sprintf(buffer, "\\%ld", *sintVals); --#endif - /* check whether current value sticks to the length limit */ - newLength = printedLength + OFstatic_cast(unsigned long, strlen(buffer)); - if ((newLength <= maxLength) && ((i + 1 == count) || (newLength + 3 <= maxLength))) -@@ -326,11 +319,7 @@ +@@ -335,11 +335,7 @@ /* get specified value from multi-valued string */ pos = DcmElement::getValueFromString(stringVal, pos, stringLen, value); if (value.empty() ||